bitkeeper revision 1.846 (40718059pi259OEdVTRV0BFJ9jTK4w)

Avoid compiler warnings.

diff --git a/xen/arch/i386/io_apic.c b/xen/arch/i386/io_apic.c
index 74a368d50d41139d9965155a41dd09bfc4e9a500..5b3a54089c291ddb431308b48b6ffb3902c03c2f 100644 (file)
--- a/xen/arch/i386/io_apic.c
+++ b/xen/arch/i386/io_apic.c
@@ -1519,25 +1519,6 @@ static void enable_NMI_through_LVT0 (void * dummy)
        apic_write_around(APIC_LVT0, v);
 }
 
-static void setup_nmi (void)
-{
-       /*
-        * Dirty trick to enable the NMI watchdog ...
-        * We put the 8259A master into AEOI mode and
-        * unmask on all local APICs LVT0 as NMI.
-        *
-        * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire')
-        * is from Maciej W. Rozycki - so we do not have to EOI from
-        * the NMI handler or the timer interrupt.
-        */ 
-       printk(KERN_INFO "activating NMI Watchdog ...");
-
-       smp_call_function(enable_NMI_through_LVT0, NULL, 1, 1);
-       enable_NMI_through_LVT0(NULL);
-
-       printk(" done.\n");
-}
-
 /*
  * This looks a bit hackish but it's about the only one way of sending
  * a few INTA cycles to 8259As and any associated glue logic.  ICR does

diff --git a/xen/arch/i386/process.c b/xen/arch/i386/process.c
index 2ff971690a12b395e622e30cb3db8ba43f4a2e68..a9c2efd06dff75033da4e7b16b22d242ae7d1a01 100644 (file)
--- a/xen/arch/i386/process.c
+++ b/xen/arch/i386/process.c
@@ -172,7 +172,7 @@ void machine_restart(char * __unused)
                 udelay(50);
             }
             /* That didn't work - force a triple fault.. */
-            __asm__ __volatile__("lidt %0": :"m" (no_idt));
+            __asm__ __volatile__("lidt %0": "=m" (no_idt));
             __asm__ __volatile__("int3");
         }
     }

diff --git a/xen/arch/i386/setup.c b/xen/arch/i386/setup.c
index d4b411ea4359321e9f3ad670818a99792e923fca..0eb4466291a1087f91cc62f86bcb8b3407ec8332 100644 (file)
--- a/xen/arch/i386/setup.c
+++ b/xen/arch/i386/setup.c
@@ -29,9 +29,9 @@ unsigned long wait_init_idle;
 struct task_struct *idle_task[NR_CPUS] = { &idle0_task };
 
 #ifdef CONFIG_ACPI_INTERPRETER
-       int acpi_disabled = 0;
+int acpi_disabled = 0;
 #else
-       int acpi_disabled = 1;
+int acpi_disabled = 1;
 #endif
 EXPORT_SYMBOL(acpi_disabled);
 
@@ -72,27 +72,27 @@ static int __init have_cpuid_p(void)
 
 void __init get_cpu_vendor(struct cpuinfo_x86 *c)
 {
-        char *v = c->x86_vendor_id;
-
-        if (!strcmp(v, "GenuineIntel"))
-                c->x86_vendor = X86_VENDOR_INTEL;
-        else if (!strcmp(v, "AuthenticAMD"))
-                c->x86_vendor = X86_VENDOR_AMD;
-        else if (!strcmp(v, "CyrixInstead"))
-                c->x86_vendor = X86_VENDOR_CYRIX;
-        else if (!strcmp(v, "UMC UMC UMC "))
-                c->x86_vendor = X86_VENDOR_UMC;
-        else if (!strcmp(v, "CentaurHauls"))
-                c->x86_vendor = X86_VENDOR_CENTAUR;
-        else if (!strcmp(v, "NexGenDriven"))
-                c->x86_vendor = X86_VENDOR_NEXGEN;
-        else if (!strcmp(v, "RiseRiseRise"))
-                c->x86_vendor = X86_VENDOR_RISE;
-        else if (!strcmp(v, "GenuineTMx86") ||
-                 !strcmp(v, "TransmetaCPU"))
-                c->x86_vendor = X86_VENDOR_TRANSMETA;
-        else
-                c->x86_vendor = X86_VENDOR_UNKNOWN;
+    char *v = c->x86_vendor_id;
+
+    if (!strcmp(v, "GenuineIntel"))
+        c->x86_vendor = X86_VENDOR_INTEL;
+    else if (!strcmp(v, "AuthenticAMD"))
+        c->x86_vendor = X86_VENDOR_AMD;
+    else if (!strcmp(v, "CyrixInstead"))
+        c->x86_vendor = X86_VENDOR_CYRIX;
+    else if (!strcmp(v, "UMC UMC UMC "))
+        c->x86_vendor = X86_VENDOR_UMC;
+    else if (!strcmp(v, "CentaurHauls"))
+        c->x86_vendor = X86_VENDOR_CENTAUR;
+    else if (!strcmp(v, "NexGenDriven"))
+        c->x86_vendor = X86_VENDOR_NEXGEN;
+    else if (!strcmp(v, "RiseRiseRise"))
+        c->x86_vendor = X86_VENDOR_RISE;
+    else if (!strcmp(v, "GenuineTMx86") ||
+             !strcmp(v, "TransmetaCPU"))
+        c->x86_vendor = X86_VENDOR_TRANSMETA;
+    else
+        c->x86_vendor = X86_VENDOR_UNKNOWN;
 }
 
 static void __init init_intel(struct cpuinfo_x86 *c)
@@ -290,13 +290,9 @@ void __init cpu_init(void)
 
 static void __init do_initcalls(void)
 {
-        initcall_t *call;
-
-        call = &__initcall_start;
-        do {
-                (*call)();
-                call++;
-        } while (call < &__initcall_end);
+    initcall_t *call;
+    for ( call = &__initcall_start; call < &__initcall_end; call++ )
+        (*call)();
 }
 
 /*
@@ -403,12 +399,12 @@ void __init start_of_day(void)
        APIC_init_uniprocessor();
     else
        smp_boot_cpus(); 
-                    /*
-                      * Does loads of stuff, including kicking the local
-                      * APIC, and the IO APIC after other CPUs are booted.
-                      * Each IRQ is preferably handled by IO-APIC, but
-                      * fall thru to 8259A if we have to (but slower).
-                      */
+    /*
+     * Does loads of stuff, including kicking the local
+     * APIC, and the IO APIC after other CPUs are booted.
+     * Each IRQ is preferably handled by IO-APIC, but
+     * fall thru to 8259A if we have to (but slower).
+     */
 #endif
 
     initialize_keytable(); /* call back handling for key codes      */

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index c830c648e3fd7d1a02dfc87f02f8a4f97cbb9994..2655b08c285eb0c55daa305559da527934ad8473 100644 (file)
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -662,13 +662,6 @@ void schedulers_start(void)
 }
 
 
-static void process_timeout(unsigned long __data)
-{
-    struct task_struct * p = (struct task_struct *) __data;
-    wake_up(p);
-}
-
-
 static void dump_rqueue(struct list_head *queue, char *name)
 {
     struct list_head *list;

diff --git a/xen/drivers/block/cciss.c b/xen/drivers/block/cciss.c
index abf5b7eea5a39fe0b897acd137e08b60e213201a..dbd5541dcc70567f41d335bcb6f742eb604d2ecc 100644 (file)
--- a/xen/drivers/block/cciss.c
+++ b/xen/drivers/block/cciss.c
@@ -119,7 +119,7 @@ static struct board_type products[] = {
 /* Originally cciss driver only supports 8 major number */
 #define MAX_CTLR_ORIG  COMPAQ_CISS_MAJOR7 - COMPAQ_CISS_MAJOR + 1
 
-#define CCISS_DMA_MASK 0xFFFFFFFFFFFFFFFF /* 64 bit DMA */
+#define CCISS_DMA_MASK (~0UL)
 
 #ifdef CONFIG_CISS_MONITOR_THREAD
 static int cciss_monitor(void *ctlr);

diff --git a/xen/drivers/ide/ide-cd.c b/xen/drivers/ide/ide-cd.c
index 168dfbca8d15ae40d0ae20a727832ca7a96b6d7a..ead14222a13892b0e1e7f0e3838f4a7b1bd2d3e8 100644 (file)
--- a/xen/drivers/ide/ide-cd.c
+++ b/xen/drivers/ide/ide-cd.c
@@ -2974,11 +2974,13 @@ int ide_cdrom_cleanup(ide_drive_t *drive)
     return 0;
 }
 
+#if 0
 static
 int ide_cdrom_reinit (ide_drive_t *drive)
 {
     return 0;
 }
+#endif /* 0 */
 
 static ide_driver_t ide_cdrom_driver = {
     name:                      "ide-cdrom",

diff --git a/xen/drivers/message/fusion/mptscsih.c b/xen/drivers/message/fusion/mptscsih.c
index 8e4b6dd96647406c4111c23a3f19bd896feeb136..46b57b04640c9a0a4f951fcf3c253e4df1c84249 100644 (file)
--- a/xen/drivers/message/fusion/mptscsih.c
+++ b/xen/drivers/message/fusion/mptscsih.c
@@ -204,10 +204,10 @@ static int        mptscsih_doDv(MPT_SCSI_HOST *hd, int channel, int target);
 static void    mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage);
 static void    mptscsih_fillbuf(char *buffer, int size, int index, int width);
 #endif
-/*static int   mptscsih_setup(char *str);*/
+#if XEN_KILLED
+static int     mptscsih_setup(char *str);
 static int     mptscsih_halt(struct notifier_block *nb, ulong event, void *buf);
 
-#if XEN_KILLED
 /*
  *     Reboot Notification
  */
@@ -2168,6 +2168,7 @@ mptscsih_release(struct Scsi_Host *host)
        return 0;
 }
 
+#if 0 /* XEN */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *     mptscsih_halt - Process the reboot notification
@@ -2209,6 +2210,7 @@ mptscsih_halt(struct notifier_block *nb, ulong event, void *buf)
 #endif
        return NOTIFY_OK;
 }
+#endif /* 0 (XEN) */
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
@@ -2286,6 +2288,7 @@ static int copy_info(struct info_str *info, char *fmt, ...)
 #define off_t int
 #endif
 
+#if 0 /* XEN */
 static int mptscsih_host_info(MPT_ADAPTER *ioc, char *pbuf, off_t offset, int len)
 {
        struct info_str info;
@@ -2302,13 +2305,16 @@ static int mptscsih_host_info(MPT_ADAPTER *ioc, char *pbuf, off_t offset, int le
 
        return ((info.pos > info.offset) ? info.pos - info.offset : 0);
 }
+#endif /* 0 (XEN) */
 
 #ifndef MPTSCSIH_DBG_TIMEOUT
+#if 0 /* XEN */
 static int mptscsih_user_command(MPT_ADAPTER *ioc, char *pbuf, int len)
 {
        /* Not yet implemented */
        return len;
 }
+#endif /* 0 (XEN) */
 #else
 #define is_digit(c)    ((c) >= '0' && (c) <= '9')
 #define digit_to_bin(c)        ((c) - '0')

diff --git a/xen/drivers/net/e100/e100_main.c b/xen/drivers/net/e100/e100_main.c
index f8afe52f6b82134fa2f4ddaefd0403ee01762ded..300e0ad4d39469f034fdca756502273c0d6c839d 100644 (file)
--- a/xen/drivers/net/e100/e100_main.c
+++ b/xen/drivers/net/e100/e100_main.c
@@ -192,9 +192,9 @@ struct notifier_block e100_notifier_reboot = {
         MODULE_PARM_DESC(X, S);
 
 /* ====================================================================== */
+#if 0
 static u8 e100_D101M_checksum(struct e100_private *, struct sk_buff *);
 static u8 e100_D102_check_checksum(rfd_t *);
-#if 0
 static int e100_ioctl(struct net_device *, struct ifreq *, int);
 #endif
 static int e100_open(struct net_device *);
@@ -243,7 +243,7 @@ static void e100_set_bool_option(struct e100_private *bdp, int, u32, int,
                                 char *);
 unsigned char e100_wait_exec_cmplx(struct e100_private *, u32, u8, u8);
 void e100_exec_cmplx(struct e100_private *, u32, u8);
-static unsigned char e100_asf_enabled(struct e100_private *bdp);
+/*static unsigned char e100_asf_enabled(struct e100_private *bdp);*/
 
 /**
  * e100_get_rx_struct - retrieve cell to hold skb buff from the pool
@@ -2941,6 +2941,7 @@ e100_rd_eaddr(struct e100_private *bdp)
 }
 
 /* Check the D102 RFD flags to see if the checksum passed */
+#if 0
 static unsigned char
 e100_D102_check_checksum(rfd_t *rfd)
 {
@@ -2955,6 +2956,7 @@ e100_D102_check_checksum(rfd_t *rfd)
        }
        return CHECKSUM_NONE;
 }
+#endif /* 0 */
 
 /**
  * e100_D101M_checksum
@@ -2966,6 +2968,7 @@ e100_D102_check_checksum(rfd_t *rfd)
  * in case the packet is ethernet II and the protocol is IP, all is need is to
  * assign this value to skb->csum.
  */
+#if 0
 static unsigned char
 e100_D101M_checksum(struct e100_private *bdp, struct sk_buff *skb)
 {
@@ -2978,6 +2981,7 @@ e100_D101M_checksum(struct e100_private *bdp, struct sk_buff *skb)
        }
        return CHECKSUM_NONE;
 }
+#endif /* 0 */
 
 /***************************************************************************/
 /***************************************************************************/
@@ -4211,7 +4215,6 @@ e100_resume(struct pci_dev *pcid)
 
        return 0;
 }
-#endif /* CONFIG_PM */
 
 /**
  * e100_asf_enabled - checks if ASF is configured on the current adaper
@@ -4237,6 +4240,7 @@ e100_asf_enabled(struct e100_private *bdp)
        }
        return false;
 }
+#endif /* CONFIG_PM */
 
 #ifdef E100_CU_DEBUG
 unsigned char

diff --git a/xen/drivers/net/tg3.c b/xen/drivers/net/tg3.c
index 8be868e9b9f89443899f3c76202c537853a01338..7a4d78a9395e83ce03ed72262d9b6ba3196c5dd8 100644 (file)
--- a/xen/drivers/net/tg3.c
+++ b/xen/drivers/net/tg3.c
@@ -5943,6 +5943,7 @@ do {      p = orig_p + (reg);     \
 
 #endif /* ETHTOOL */
 
+#if 0
 static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct tg3 *tp = dev->priv;
@@ -6091,6 +6092,7 @@ static int tg3_nway_reset(struct net_device *dev)
   
        return r;
 }
+#endif /* 0 */
   
 #ifdef ETHTOOL
 
@@ -6178,6 +6180,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
   
 #endif /* ETHTOOL */
 
+#if 0
 static u32 tg3_get_rx_csum(struct net_device *dev)
 {
        struct tg3 *tp = dev->priv;
@@ -6221,7 +6224,8 @@ static int tg3_set_tx_csum(struct net_device *dev, u32 data)
 
        return 0;
 }
-  
+#endif /* 0 */
+
 static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr->ifr_data;

diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c
index 4f31a003ac1078dc0a953ab9fce71815a2615e9f..488a510cc439c72f558d2b3974f2cf0477c1df23 100644 (file)
--- a/xen/drivers/pci/pci.c
+++ b/xen/drivers/pci/pci.c
@@ -619,6 +619,7 @@ pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev)
        return NULL;
 }
 
+#ifndef NO_DEVICES_IN_XEN
 static int
 pci_announce_device(struct pci_driver *drv, struct pci_dev *dev)
 {
@@ -643,6 +644,7 @@ pci_announce_device(struct pci_driver *drv, struct pci_dev *dev)
 out:
        return ret;
 }
+#endif /* !NO_DEVICES_IN_XEN */
 
 /**
  * pci_register_driver - register a new pci driver

diff --git a/xen/drivers/scsi/BusLogic.c b/xen/drivers/scsi/BusLogic.c
index 8005d015fc5d8e74e3b795163685ee4e5b0afec9..8fba3d19d7cb83606050896a19fb731fcea61a81 100644 (file)
--- a/xen/drivers/scsi/BusLogic.c
+++ b/xen/drivers/scsi/BusLogic.c
@@ -4440,6 +4440,7 @@ static void BusLogic_Message(BusLogic_MessageLevel_T MessageLevel,
 }
 
 
+#if 0 /* XEN */
 /*
   BusLogic_ParseKeyword parses an individual option keyword.  It returns true
   and updates the pointer if the keyword is recognized and false otherwise.
@@ -4462,7 +4463,6 @@ static boolean BusLogic_ParseKeyword(char **StringPointer, char *Keyword)
   return true;
 }
 
-#if 0 /* XEN */
 /*
   BusLogic_ParseDriverOptions handles processing of BusLogic Driver Options
   specifications.

diff --git a/xen/drivers/scsi/BusLogic.h b/xen/drivers/scsi/BusLogic.h
index 2e1c2bfc75cf59d64f14518dcbb9020328215653..506ac8047318bc48e56dbf17c99e256355e6052f 100644 (file)
--- a/xen/drivers/scsi/BusLogic.h
+++ b/xen/drivers/scsi/BusLogic.h
@@ -1801,8 +1801,8 @@ static void BusLogic_ReleaseResources(BusLogic_HostAdapter_T *) __init;
 static boolean BusLogic_TargetDeviceInquiry(BusLogic_HostAdapter_T *) __init;
 static void BusLogic_InitializeHostStructure(BusLogic_HostAdapter_T *,
                                             SCSI_Host_T *) __init;
-static boolean BusLogic_ParseKeyword(char **, char *) __init;
 #if 0 /* XEN */
+static boolean BusLogic_ParseKeyword(char **, char *) __init;
 static int BusLogic_ParseDriverOptions(char *) __init;
 static int BusLogic_Setup(char *) __init;
 #endif

diff --git a/xen/drivers/scsi/aacraid/linit.c b/xen/drivers/scsi/aacraid/linit.c
index 17d1fc26354ec494ec747fd02a07d2f03ce5b5fb..19d6135e987d818bebbc3c04972b0a587c733581 100644 (file)
--- a/xen/drivers/scsi/aacraid/linit.c
+++ b/xen/drivers/scsi/aacraid/linit.c
@@ -645,6 +645,7 @@ static int aac_ioctl(Scsi_Device * scsi_dev_ptr, int cmd, void * arg)
        return aac_do_ioctl(dev, cmd, arg);
 }
 
+#if 0 /* XEN */
 /**
  *     aac_cfg_open            -       open a configuration file
  *     @inode: inode being opened
@@ -698,6 +699,7 @@ static int aac_cfg_ioctl(struct inode * inode,  struct file * file, unsigned int
        struct aac_dev *dev = aac_devices[MINOR(inode->i_rdev)];
        return aac_do_ioctl(dev, cmd, (void *)arg);
 }
+#endif /* 0 (XEN) */
 
 /*
  *     To use the low level SCSI driver support using the linux kernel loadable 

diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c
index 4160261569da5f5eadbd70130c0dfd250df45ffc..85f3f768283e6c63f076c911efbb136df6f4ce10 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -403,7 +403,7 @@ static int ahd_linux_next_unit(void);
 static void ahd_runq_tasklet(unsigned long data);
 /* SAE: .... */
 struct notifier_block;
-static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf);
+/*static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf);*/
 
 static __inline struct ahd_linux_device*
                     ahd_linux_get_device(struct ahd_softc *ahd, u_int channel,
@@ -613,7 +613,7 @@ ahd_linux_map_seg(struct ahd_softc *ahd, struct scb *scb,
                        consumed++;
                        next_sg = sg + 1;
                        next_sg->addr = 0;
-                       next_len = 0x100000000 - (addr & 0xFFFFFFFF);
+                       next_len = (uint32_t)((-addr) & 0xFFFFFFFF);
                        len -= next_len;
                        next_len |= ((addr >> 8) + 0x1000000) & 0x7F000000;
                        next_sg->len = ahd_htole32(next_len);
@@ -655,7 +655,6 @@ ahd_runq_tasklet(unsigned long data)
 static struct notifier_block ahd_linux_notifier = {
        ahd_linux_halt, NULL, 0
 };
-*/
 
 static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf)
 {
@@ -668,6 +667,7 @@ static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf)
        }
        return (NOTIFY_OK);
 }
+*/
 
 /******************************** Macros **************************************/
 #define BUILD_SCSIID(ahd, cmd)                                         \

diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/xen/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 53cf44e6effa4c481a04d8d422f9087937b1139c..9381627f070e780df49f239b2f4f05bb35364a09 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -159,12 +159,12 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                uint64_t memsize;
 
                memsize = ahd_linux_get_memsize();
-               if (memsize >= 0x8000000000
+               if (memsize >= 0x8000000000ULL
                 && ahd_pci_set_dma_mask(pdev, 0xFFFFFFFFFFFFFFFFULL) == 0) {
                        ahd->flags |= AHD_64BIT_ADDRESSING;
                        ahd->platform_data->hw_dma_mask =
                            (bus_addr_t)(0xFFFFFFFFFFFFFFFFULL&(bus_addr_t)~0);
-               } else if (memsize > 0x80000000
+               } else if (memsize > 0x80000000ULL
                        && ahd_pci_set_dma_mask(pdev, 0x7FFFFFFFFFULL) == 0) {
                        ahd->flags |= AHD_39BIT_ADDRESSING;
                        ahd->platform_data->hw_dma_mask =

diff --git a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 2d4f18f1cc9737035f216a3d06b8fe12c94bd03a..f305095da79f645d2043c2bac89c8701abde4629 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -447,9 +447,11 @@ static void ahc_linux_handle_scsi_status(struct ahc_softc *,
                                         struct scb *);
 static void ahc_linux_filter_command(struct ahc_softc*, Scsi_Cmnd*,
                                     struct scb*);
-//static void ahc_linux_sem_timeout(u_long arg);
+#if 0
+static void ahc_linux_sem_timeout(u_long arg);
 static void ahc_linux_freeze_sim_queue(struct ahc_softc *ahc);
 static void ahc_linux_release_sim_queue(u_long arg);
+#endif
 static void ahc_linux_dev_timed_unfreeze(u_long arg);
 static int  ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag);
 static void ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc);
@@ -473,7 +475,9 @@ static void ahc_linux_run_device_queue(struct ahc_softc*,
 static void ahc_linux_setup_tag_info(char *p, char *end);
 static int ahc_linux_next_unit(void);
 static void ahc_runq_tasklet(unsigned long data);
+#if 0
 static int ahc_linux_halt(struct notifier_block *nb, u_long event, void *buf);
+#endif
 
 static __inline struct ahc_linux_device*
                     ahc_linux_get_device(struct ahc_softc *ahc, u_int channel,
@@ -683,7 +687,7 @@ ahc_linux_map_seg(struct ahc_softc *ahc, struct scb *scb,
                        consumed++;
                        next_sg = sg + 1;
                        next_sg->addr = 0;
-                       next_len = 0x100000000 - (addr & 0xFFFFFFFF);
+                       next_len = (uint32_t)((-addr) & 0xFFFFFFFF);
                        len -= next_len;
                        next_len |= ((addr >> 8) + 0x1000000) & 0x7F000000;
                        next_sg->len = ahc_htole32(next_len);
@@ -725,7 +729,6 @@ ahc_runq_tasklet(unsigned long data)
 static struct notifier_block ahc_linux_notifier = {
        ahc_linux_halt, NULL, 0
 };
-#endif
 
 static int ahc_linux_halt(struct notifier_block *nb, u_long event, void *buf)
 {
@@ -738,6 +741,7 @@ static int ahc_linux_halt(struct notifier_block *nb, u_long event, void *buf)
        }
        return (NOTIFY_OK);
 }
+#endif
 
 /******************************** Macros **************************************/
 #define BUILD_SCSIID(ahc, cmd)                                         \
@@ -2498,7 +2502,6 @@ ahc_linux_sem_timeout(u_long arg)
        sem = (struct semaphore *)arg;
        up(sem);
 }
-#endif
 
 static void
 ahc_linux_freeze_sim_queue(struct ahc_softc *ahc)
@@ -2539,6 +2542,7 @@ ahc_linux_release_sim_queue(u_long arg)
 #endif
        }
 }
+#endif /* 0 */
 
 static void
 ahc_linux_dev_timed_unfreeze(u_long arg)

diff --git a/xen/drivers/scsi/megaraid.c b/xen/drivers/scsi/megaraid.c
index 727f19b28a8a55fa104a0cb8f49ec5397b164b74..7ee589e1d3fd54032e32871707261d454c77ccdd 100644 (file)
--- a/xen/drivers/scsi/megaraid.c
+++ b/xen/drivers/scsi/megaraid.c
@@ -4549,6 +4549,7 @@ mega_partsize(Disk * disk, kdev_t dev, int *geom)
 }
 
 
+#if 0 /* XEN */
 /*
  * This routine will be called when the use has done a forced shutdown on the
  * system. Flush the Adapter cache, that's the most we can do.
@@ -4587,6 +4588,7 @@ static int megaraid_reboot_notify (struct notifier_block *this, unsigned long co
        }
        return NOTIFY_DONE;
 }
+#endif /* 0 (XEN) */
 
 static int mega_init_scb (mega_host_config * megacfg)
 {
@@ -4714,6 +4716,7 @@ static void enq_scb_freelist (mega_host_config * megacfg, mega_scb * scb, int lo
        }
 }
 
+#if 0 /* XEN */
 /*
  * Routines for the character/ioctl interface to the driver
  */
@@ -4742,6 +4745,7 @@ static int megadev_ioctl_entry (struct inode *inode, struct file *filep,
        return ret;
 
 }
+#endif /* 0 (XEN) */
 
 static int megadev_ioctl (struct inode *inode, struct file *filep,
               unsigned int cmd, unsigned long arg)
@@ -5272,6 +5276,7 @@ megadev_doioctl (mega_host_config * megacfg, Scsi_Cmnd * sc)
        return scb;
 }
 
+#if 0
 static int
 megadev_close (struct inode *inode, struct file *filep)
 {
@@ -5280,6 +5285,7 @@ megadev_close (struct inode *inode, struct file *filep)
 #endif
        return 0;
 }
+#endif /* 0 */
 
 
 static int

diff --git a/xen/drivers/scsi/megaraid.h b/xen/drivers/scsi/megaraid.h
index ebae1a2790675371764919d24df7955f2f7e14e3..aedc6388d49d11fce4f36506cb7bec7ae718a27c 100644 (file)
--- a/xen/drivers/scsi/megaraid.h
+++ b/xen/drivers/scsi/megaraid.h
@@ -998,21 +998,27 @@ static void mega_Convert8ldTo40ld (mega_RAIDINQ * inquiry,
                                   mega_Enquiry3 * enquiry3,
                                   megaRaidProductInfo * productInfo);
 
+#if 0
 static int megaraid_reboot_notify (struct notifier_block *,
                                   unsigned long, void *);
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)  
 static mega_scb *mega_ioctl (mega_host_config * megaCfg, Scsi_Cmnd * SCpnt);
 static void mega_build_kernel_sg (char *barea, ulong xfersize, mega_scb * pScb,
                           mega_ioctl_mbox * mbox);
 #endif
 
+#if 0
 static int megadev_open (struct inode *, struct file *);
 static int megadev_ioctl_entry (struct inode *, struct file *,
                                unsigned int, unsigned long);
+#endif
 static int megadev_ioctl (struct inode *, struct file *,
                          unsigned int, unsigned long);
 static mega_scb *megadev_doioctl (mega_host_config *, Scsi_Cmnd *);
+#if 0
 static int megadev_close (struct inode *, struct file *);
+#endif
 static void megadev_ioctl_done (Scsi_Cmnd *);
 static int mega_init_scb (mega_host_config *);
 static void enq_scb_freelist (mega_host_config *, mega_scb *,

diff --git a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c
index 7053b458b124330005436b8cb02c38614535dfb6..01be59ee03350dda0388a3d5b415715ae96604cf 100644 (file)
--- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -1106,7 +1106,7 @@ static void sym_eh_done(Scsi_Cmnd *cmd) { __sym_eh_done(cmd, 0); }
 /*
  *  Some timeout handler to avoid waiting too long.
  */
-static void sym_eh_timeout(u_long p) { __sym_eh_done((Scsi_Cmnd *)p, 1); }
+/*static void sym_eh_timeout(u_long p) { __sym_eh_done((Scsi_Cmnd *)p, 1); }*/
 
 /*
  *  Generic method for our eh processing.